Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 34a816c

Browse files
committedOct 15, 2014
fix links
1 parent 3a3053a commit 34a816c

File tree

1 file changed

+87
-87
lines changed

1 file changed

+87
-87
lines changed
 

‎activitystreams2.html

+87-87
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ <h3 role="heading" id="h3_syntaxconventions"><span class="secno">1.2 </span>Seri
413413

414414
<p>
415415
This specification describes a JSON-based [<cite><a class="bibref" href="#bib-RFC7159">RFC7159</a></cite>] serialization
416-
syntax for the <a href="activitystreams2-vocabulary.html">Activity
416+
syntax for the <a href="as-vocab.html">Activity
417417
Vocabulary</a> that follows the conventions defined by the
418418
[<cite><a class="bibref" href="#bib-JSON-LD">JSON-LD</a></cite>] specification. While serialization forms other than
419419
JSON-LD are possible, alternatives are not discussed by this
@@ -493,7 +493,7 @@ <h3 role="heading" id="h3_example-2"><span class="secno">2.2 </span>Basic activi
493493
Expresses the statement "Martin Smith posted an article to the blog
494494
'Martin's Blog' at 3:04 PM GMT on February 2, 2011." Some additional
495495
details about the article, actor and target blog are given using properties
496-
defined by the <a href="activitystreams2-vocabulary.html">Activity Streams 2.0
496+
defined by the <a href="as-vocab.html">Activity Streams 2.0
497497
Vocabulary</a>.
498498
</span></figcaption>
499499
<div class="example"><div class="example-title"><span>Example 2</span></div><pre class="example highlight json prettyprint prettyprinted"><span class="pun">{</span><span class="pln">
@@ -605,7 +605,7 @@ <h3 role="heading" id="h3_example-3"><span class="secno">2.3 </span>An extended
605605
<!--OddPage--><h2 role="heading" id="h2_model"><span class="secno">3. </span>Model</h2>
606606

607607
<p>
608-
The <a href="activitystreams2-vocabulary.html">Activity Vocabulary</a>
608+
The <a href="as-vocab.html">Activity Vocabulary</a>
609609
defines the abstract model for Activity Streams 2.0. The vocabulary
610610
document defines seven distinct abstract classes: <a href="#asobject" class="internalDFN">Object</a>,
611611
<a href="#dfn-link" class="internalDFN">Link</a>, <a href="#collection" class="internalDFN">Collection</a>, <a href="#activity" class="internalDFN">Activity</a>, <a href="#dfn-naturallanguagevalue" class="internalDFN">NaturalLanguageValue</a>,
@@ -617,7 +617,7 @@ <h3 role="heading" id="h3_example-3"><span class="secno">2.3 </span>An extended
617617
<h3 role="heading" id="h3_object"><span class="secno">3.1 </span><dfn title="Object" id="asobject">Object</dfn></h3>
618618

619619
<p>
620-
The <code><a href="activitystreams2-vocabulary.html#dfn-object">Object</a></code>
620+
The <code><a href="as-vocab.html#dfn-object">Object</a></code>
621621
class is the primary base class for the Activity Streams vocabulary. An
622622
implementations would typically create it's own set of subclasses that
623623
derive from the <code>http://activitystrea.ms/2.0/Object</code> class as
@@ -628,48 +628,48 @@ <h3 role="heading" id="h3_object"><span class="secno">3.1 </span><dfn title="Obj
628628
In addition to having a global identifier in the form of an absolute IRI
629629
and an "object type" (expressed in JSON-LD using the <code>@type</code> keyword),
630630
all instances of the <code>Object</code> class share a common set of properties
631-
as defined by the <a href="activitystreams2-vocabulary.html">Activity Vocabulary</a>.
631+
as defined by the <a href="as-vocab.html">Activity Vocabulary</a>.
632632
These include:
633633
<code>
634-
<a href="activitystreams2-vocabulary.html#dfn-action">action</a> |
635-
<a href="activitystreams2-vocabulary.html#dfn-alias">alias</a> |
636-
<a href="activitystreams2-vocabulary.html#dfn-attachment">attachment</a> |
637-
<a href="activitystreams2-vocabulary.html#dfn-author">author</a> |
638-
<a href="activitystreams2-vocabulary.html#dfn-content">content</a> |
639-
<a href="activitystreams2-vocabulary.html#dfn-displayname">displayName</a> |
640-
<a href="activitystreams2-vocabulary.html#dfn-duration">duration</a> |
641-
<a href="activitystreams2-vocabulary.html#dfn-endtime">endTime</a> |
642-
<a href="activitystreams2-vocabulary.html#dfn-generator">generator</a> |
643-
<a href="activitystreams2-vocabulary.html#dfn-height">height</a> |
644-
<a href="activitystreams2-vocabulary.html#dfn-icon">icon</a> |
645-
<a href="activitystreams2-vocabulary.html#dfn-image">image</a> |
646-
<a href="activitystreams2-vocabulary.html#dfn-inreplyto">inReplyTo</a> |
647-
<a href="activitystreams2-vocabulary.html#dfn-language">language</a> |
648-
<a href="activitystreams2-vocabulary.html#dfn-location">location</a> |
649-
<a href="activitystreams2-vocabulary.html#dfn-memberof">memberOf</a> |
650-
<a href="activitystreams2-vocabulary.html#dfn-provider">provider</a> |
651-
<a href="activitystreams2-vocabulary.html#dfn-published">published</a> |
652-
<a href="activitystreams2-vocabulary.html#dfn-rating">rating</a> |
653-
<a href="activitystreams2-vocabulary.html#dfn-replies">replies</a> |
654-
<a href="activitystreams2-vocabulary.html#dfn-resultof">resultOf</a> |
655-
<a href="activitystreams2-vocabulary.html#dfn-scope">scope</a> |
656-
<a href="activitystreams2-vocabulary.html#dfn-starttime">startTime</a> |
657-
<a href="activitystreams2-vocabulary.html#dfn-summary">summary</a> |
658-
<a href="activitystreams2-vocabulary.html#dfn-tag">tag</a> |
659-
<a href="activitystreams2-vocabulary.html#dfn-title">title</a> |
660-
<a href="activitystreams2-vocabulary.html#dfn-updated">updated</a> |
661-
<a href="activitystreams2-vocabulary.html#dfn-validafter">validAfter</a> |
662-
<a href="activitystreams2-vocabulary.html#dfn-validbefore">validBefore</a> |
663-
<a href="activitystreams2-vocabulary.html#dfn-validfrom">validFrom</a> |
664-
<a href="activitystreams2-vocabulary.html#dfn-validuntil">validUntil</a> |
665-
<a href="activitystreams2-vocabulary.html#dfn-width">width</a> |
666-
<a href="activitystreams2-vocabulary.html#dfn-url">url</a>
634+
<a href="as-vocab.html#dfn-action">action</a> |
635+
<a href="as-vocab.html#dfn-alias">alias</a> |
636+
<a href="as-vocab.html#dfn-attachment">attachment</a> |
637+
<a href="as-vocab.html#dfn-author">author</a> |
638+
<a href="as-vocab.html#dfn-content">content</a> |
639+
<a href="as-vocab.html#dfn-displayname">displayName</a> |
640+
<a href="as-vocab.html#dfn-duration">duration</a> |
641+
<a href="as-vocab.html#dfn-endtime">endTime</a> |
642+
<a href="as-vocab.html#dfn-generator">generator</a> |
643+
<a href="as-vocab.html#dfn-height">height</a> |
644+
<a href="as-vocab.html#dfn-icon">icon</a> |
645+
<a href="as-vocab.html#dfn-image">image</a> |
646+
<a href="as-vocab.html#dfn-inreplyto">inReplyTo</a> |
647+
<a href="as-vocab.html#dfn-language">language</a> |
648+
<a href="as-vocab.html#dfn-location">location</a> |
649+
<a href="as-vocab.html#dfn-memberof">memberOf</a> |
650+
<a href="as-vocab.html#dfn-provider">provider</a> |
651+
<a href="as-vocab.html#dfn-published">published</a> |
652+
<a href="as-vocab.html#dfn-rating">rating</a> |
653+
<a href="as-vocab.html#dfn-replies">replies</a> |
654+
<a href="as-vocab.html#dfn-resultof">resultOf</a> |
655+
<a href="as-vocab.html#dfn-scope">scope</a> |
656+
<a href="as-vocab.html#dfn-starttime">startTime</a> |
657+
<a href="as-vocab.html#dfn-summary">summary</a> |
658+
<a href="as-vocab.html#dfn-tag">tag</a> |
659+
<a href="as-vocab.html#dfn-title">title</a> |
660+
<a href="as-vocab.html#dfn-updated">updated</a> |
661+
<a href="as-vocab.html#dfn-validafter">validAfter</a> |
662+
<a href="as-vocab.html#dfn-validbefore">validBefore</a> |
663+
<a href="as-vocab.html#dfn-validfrom">validFrom</a> |
664+
<a href="as-vocab.html#dfn-validuntil">validUntil</a> |
665+
<a href="as-vocab.html#dfn-width">width</a> |
666+
<a href="as-vocab.html#dfn-url">url</a>
667667
</code>
668668
</p>
669669

670670
<p>
671671
While all properties are optional, all <code>Object</code> instances <em class="rfc2119" title="SHOULD">SHOULD</em>
672-
at least contain a <a href="activitystreams2-vocabulary.html#dfn-displayname">displayName</a>.
672+
at least contain a <a href="as-vocab.html#dfn-displayname">displayName</a>.
673673
</p>
674674

675675
<figure id="fig-following-is-an-example-object-that-uses-the-json-id-id-and-type-json-ld-keywords-to-express-the-global-identifier-and-object-type"><figcaption>Fig. <span class="figno">4</span> <span class="fig-title">Following is an example Object that uses the JSON-ID <code>@id</code> and <code>@type</code>
@@ -694,8 +694,8 @@ <h3 role="heading" id="h3_object"><span class="secno">3.1 </span><dfn title="Obj
694694
<h3 role="heading" id="h3_naturalLanguageValues"><span class="secno">3.2 </span><dfn title="NaturalLanguageValue" id="dfn-naturallanguagevalue">Natural Language Values</dfn></h3>
695695

696696
<p>
697-
Several properties defined by the <a href="activitystreams2-vocabulary.html">Vocabulary</a>
698-
are defined as being a <a href="activitystreams2-vocabulary.html">Natural Language Value</a>.
697+
Several properties defined by the <a href="as-vocab.html">Vocabulary</a>
698+
are defined as being a <a href="as-vocab.html">Natural Language Value</a>.
699699
These are a representations of human-readable character sequences using one or more
700700
languages. Within the JSON-LD serialization, they are expressed as either (1) a single JSON
701701
string or (2) a JSON object mapping [<cite><a class="bibref" href="#bib-RFC5646">RFC5646</a></cite>] Language-Tags to localized, equivalent
@@ -704,7 +704,7 @@ <h3 role="heading" id="h3_naturalLanguageValues"><span class="secno">3.2 </span>
704704
</p>
705705

706706
<p>
707-
For instance, the <code><a href="activitystreams2-vocabulary.html#dfn-displayName">displayName</a></code>
707+
For instance, the <code><a href="as-vocab.html#dfn-displayName">displayName</a></code>
708708
property is a Natural Language value.
709709
</p>
710710

@@ -817,20 +817,20 @@ <h3 role="heading" id="h3_link"><span class="secno">3.3 </span><dfn title="Link"
817817
The target URI of the Link is the global identifier expressed in the JSON-LD
818818
serialization using the <code>@id</code> keyword. In addition, all <code>Link</code>
819819
instances share the following common set of properties as defined by the
820-
<a href="activitystreams2-vocabulary.html">Activity Vocabulary</a>:
820+
<a href="as-vocab.html">Activity Vocabulary</a>:
821821
<code>
822-
<a href="activitystreams2-vocabulary.html#dfn-displayname">displayName</a> |
823-
<a href="activitystreams2-vocabulary.html#dfn-hreflang">hreflang</a> |
824-
<a href="activitystreams2-vocabulary.html#dfn-language">language</a> |
825-
<a href="activitystreams2-vocabulary.html#dfn-mediatype">mediaType</a> |
826-
<a href="activitystreams2-vocabulary.html#dfn-rel">rel</a> |
827-
<a href="activitystreams2-vocabulary.html#dfn-title">title</a>
822+
<a href="as-vocab.html#dfn-displayname">displayName</a> |
823+
<a href="as-vocab.html#dfn-hreflang">hreflang</a> |
824+
<a href="as-vocab.html#dfn-language">language</a> |
825+
<a href="as-vocab.html#dfn-mediatype">mediaType</a> |
826+
<a href="as-vocab.html#dfn-rel">rel</a> |
827+
<a href="as-vocab.html#dfn-title">title</a>
828828
</code>
829829
</p>
830830

831831
<p>
832832
For example, all <a title="Object" href="#asobject" class="internalDFN">Objects</a> can contain an
833-
<code><a href="activitystreams2-vocabulary.html#dfn-image">image</a></code>
833+
<code><a href="as-vocab.html#dfn-image">image</a></code>
834834
property whose value describes a graphical
835835
representation of the containing object. This property will
836836
typically be used to provide the URL to a JPEG, GIF or PNG type
@@ -902,7 +902,7 @@ <h3 role="heading" id="h3_link"><span class="secno">3.3 </span><dfn title="Link"
902902
<p>
903903
RFC 5988 defines that all Links have a "link relation" that describes
904904
the contextual purpose of the link. Within a <a href="#dfn-link" class="internalDFN">Link</a>,
905-
the <code><a href="activitystreams2-vocabulary.html#dfn-rel">rel</a></code> property
905+
the <code><a href="as-vocab.html#dfn-rel">rel</a></code> property
906906
provides the link relation value. If no <code>rel</code> property is
907907
specified, the Link is not considered to have a specified link relation.
908908
</p>
@@ -979,21 +979,21 @@ <h3 role="heading" id="h3_activities"><span class="secno">3.4 </span><dfn title=
979979
<p>
980980
In additional to common properties supported by all <a href="#asobject" class="internalDFN">Object</a>
981981
instances, <code>Activity</code> objects support the following additional
982-
properties defined by the <a href="activitystreams2-vocabulary.html">Vocabulary</a>:
982+
properties defined by the <a href="as-vocab.html">Vocabulary</a>:
983983
<code>
984-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">verb</a> |
985-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">actor</a> |
986-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">object</a> |
987-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">target</a> |
988-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">result</a> |
989-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">instrument</a> |
990-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">participant</a> |
991-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">priority</a> |
992-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">status</a> |
993-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">to</a> |
994-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">bto</a> |
995-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">cc</a> |
996-
<a href="activitystreams2-vocabulary.html#dfn-verb-term">bcc</a>
984+
<a href="as-vocab.html#dfn-verb-term">verb</a> |
985+
<a href="as-vocab.html#dfn-verb-term">actor</a> |
986+
<a href="as-vocab.html#dfn-verb-term">object</a> |
987+
<a href="as-vocab.html#dfn-verb-term">target</a> |
988+
<a href="as-vocab.html#dfn-verb-term">result</a> |
989+
<a href="as-vocab.html#dfn-verb-term">instrument</a> |
990+
<a href="as-vocab.html#dfn-verb-term">participant</a> |
991+
<a href="as-vocab.html#dfn-verb-term">priority</a> |
992+
<a href="as-vocab.html#dfn-verb-term">status</a> |
993+
<a href="as-vocab.html#dfn-verb-term">to</a> |
994+
<a href="as-vocab.html#dfn-verb-term">bto</a> |
995+
<a href="as-vocab.html#dfn-verb-term">cc</a> |
996+
<a href="as-vocab.html#dfn-verb-term">bcc</a>
997997
</code>
998998
</p>
999999

@@ -1071,10 +1071,10 @@ <h4 role="heading" id="h4_audienceTargeting"><span class="secno">3.4.2 </span>Au
10711071
the activity, to infer the primary audience for many types of
10721072
activities, those do not work in every case and do not provide a
10731073
means of identifying the secondary audience. The
1074-
<code><a href="activitystreams2-vocabulary.html#dfn-to">to</a></code>,
1075-
<code><a href="activitystreams2-vocabulary.html#dfn-cc">cc</a></code>,
1076-
<code><a href="activitystreams2-vocabulary.html#dfn-bto">bto</a></code> and
1077-
<code><a href="activitystreams2-vocabulary.html#dfn-bcc">bcc</a></code>
1074+
<code><a href="as-vocab.html#dfn-to">to</a></code>,
1075+
<code><a href="as-vocab.html#dfn-cc">cc</a></code>,
1076+
<code><a href="as-vocab.html#dfn-bto">bto</a></code> and
1077+
<code><a href="as-vocab.html#dfn-bcc">bcc</a></code>
10781078
properties <em class="rfc2119" title="MAY">MAY</em> be used within an Activity to explicitly identify the
10791079
Primary and Secondary audiences.
10801080
</p>
@@ -1157,18 +1157,18 @@ <h3 role="heading" id="h3_collections"><span class="secno">3.5 </span><dfn title
11571157
<code>Collection</code> objects set of properties defined by the
11581158
<a href="activitystreams2-vocabulary">Vocabulary</a>. These include:
11591159
<code>
1160-
<a href="activitystreams2-vocabulary.html#dfn-items">items</a> |
1161-
<a href="activitystreams2-vocabulary.html#dfn-totalItems">totalItems</a> |
1162-
<a href="activitystreams2-vocabulary.html#dfn-itemsPerPage">itemsPerPage</a> |
1163-
<a href="activitystreams2-vocabulary.html#dfn-startIndex">startIndex</a> |
1164-
<a href="activitystreams2-vocabulary.html#dfn-itemsAfter">itemsAfter</a> |
1165-
<a href="activitystreams2-vocabulary.html#dfn-itemsBefore">itemsBefore</a> |
1166-
<a href="activitystreams2-vocabulary.html#dfn-current">current</a> |
1167-
<a href="activitystreams2-vocabulary.html#dfn-next">next</a> |
1168-
<a href="activitystreams2-vocabulary.html#dfn-prev">prev</a> |
1169-
<a href="activitystreams2-vocabulary.html#dfn-first">first</a> |
1170-
<a href="activitystreams2-vocabulary.html#dfn-last">last</a> |
1171-
<a href="activitystreams2-vocabulary.html#dfn-self">self</a>
1160+
<a href="as-vocab.html#dfn-items">items</a> |
1161+
<a href="as-vocab.html#dfn-totalItems">totalItems</a> |
1162+
<a href="as-vocab.html#dfn-itemsPerPage">itemsPerPage</a> |
1163+
<a href="as-vocab.html#dfn-startIndex">startIndex</a> |
1164+
<a href="as-vocab.html#dfn-itemsAfter">itemsAfter</a> |
1165+
<a href="as-vocab.html#dfn-itemsBefore">itemsBefore</a> |
1166+
<a href="as-vocab.html#dfn-current">current</a> |
1167+
<a href="as-vocab.html#dfn-next">next</a> |
1168+
<a href="as-vocab.html#dfn-prev">prev</a> |
1169+
<a href="as-vocab.html#dfn-first">first</a> |
1170+
<a href="as-vocab.html#dfn-last">last</a> |
1171+
<a href="as-vocab.html#dfn-self">self</a>
11721172
</code>
11731173
</p>
11741174

@@ -1232,7 +1232,7 @@ <h3 role="heading" id="h3_actions"><span class="secno">3.7 </span><dfn id="dfn-p
12321232

12331233
<p>
12341234
All <code>Object</code> instances can have an
1235-
<code><a href="activitystreams2-vocabulary.html#dfn-action">action</a></code> property
1235+
<code><a href="as-vocab.html#dfn-action">action</a></code> property
12361236
used to describe the kinds of potential activities that can be taken with
12371237
regards to the object. The value is expressed as a JSON object conforming
12381238
to the <code><a href="activitystreams2-actions.html#dfn-potentialaction">PotentialAction</a></code>
@@ -1326,10 +1326,10 @@ <h3 role="heading" id="h3_actions"><span class="secno">3.7 </span><dfn id="dfn-p
13261326
JSON-LD keywords <code>@id</code> and <code>@type</code>, respectively.
13271327
</li>
13281328
<li>
1329-
This document redefines the <code><a href="activitystreams2-vocabulary.html#dfn-displayname">displayName</a></code>,
1330-
<code><a href="activitystreams2-vocabulary.html#dfn-title">title</a></code>,
1331-
<code><a href="activitystreams2-vocabulary.html#dfn-content">content</a></code> and
1332-
<code><a href="activitystreams2-vocabulary.html#dfn-summary">summary</a></code>
1329+
This document redefines the <code><a href="as-vocab.html#dfn-displayname">displayName</a></code>,
1330+
<code><a href="as-vocab.html#dfn-title">title</a></code>,
1331+
<code><a href="as-vocab.html#dfn-content">content</a></code> and
1332+
<code><a href="as-vocab.html#dfn-summary">summary</a></code>
13331333
properties as <a title="NaturalLanguageValue" href="#dfn-naturallanguagevalue" class="internalDFN">Natural Language Values</a>,
13341334
which means their values can be expressed as either a String or a
13351335
JSON-LD Language Map. In the 1.0 syntax, these are expressed
@@ -1634,7 +1634,7 @@ <h3 role="heading" id="h3_media-type"><span class="secno">8.1 </span>The <code>a
16341634
<h2 id="x2014-09-30">2014-09-30</h2>
16351635
<ul>
16361636
<li>Rework serialization model to be based on JSON-LD.</li>
1637-
<li>Updated <a href="activitystreams2-vocabulary.html">vocabulary model</a>.</li>
1637+
<li>Updated <a href="as-vocab.html">vocabulary model</a>.</li>
16381638
<li>Remove notion of "Type Values".</li>
16391639
<li>Redefine "Link Values" as "Link".</li>
16401640
<li>Removed the "duplicates" property introduced in earlier AS2 drafts due to lack of any implementation evidence.</li>

0 commit comments

Comments
 (0)
Please sign in to comment.